merge trunk
authorK. Handa <handa@gnu.org>
Tue, 19 Mar 2013 06:12:39 +0000 (15:12 +0900)
committerK. Handa <handa@gnu.org>
Tue, 19 Mar 2013 06:12:39 +0000 (15:12 +0900)

Trivial merge